-
Notifications
You must be signed in to change notification settings - Fork 90
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
MINIFICPP-1099 - Fix Windows MSI build #692
Conversation
Still testing different configurations - @amarmer if you could try it with your on environment, that would be nice. |
# Determine the path of the VC Redistributable Merge Modules | ||
if (DEFINED ENV{VCToolsRedistDir}) | ||
# Just get the redist dir that has been set by the build environment | ||
set(VCRUNTIME_REDIST_DIR $ENV{VCToolsRedistDir}) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems like a pretty reliable method with 2017, it is both defined when building directly from Visual Studio, and when using a terminal vcvarsall.bat, but I included the backup method because I am not sure how reliable it is across VS versions.
@@ -23,6 +23,7 @@ set builddir=%1 | |||
set skiptests=OFF | |||
set cmake_build_type=Release | |||
set build_type=Release | |||
set build_platform=Win32 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When using with vcvarsall.bat, it sets an environment variable which makes msbuild default to x86 as the default platform, not Win32, so we use this to make sure we use the proper Win32 platform.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good at first, will test.
I tested. LGTM! |
@amarmer Thank you for trying it. |
Tested the build on Win10 X64 with VS2017 community, builds as expected, installer works, MiNiFi starts after installation. The CI failure seems to be unrelated, merging this. |
Thank you for submitting a contribution to Apache NiFi - MiNiFi C++.
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
For all changes:
Is there a JIRA ticket associated with this PR? Is it referenced
in the commit message?
Does your PR title start with MINIFICPP-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
Has your PR been rebased against the latest commit within the target branch (typically master)?
Is your initial contribution a single, squashed commit?
For code changes:
For documentation related changes:
Note:
Please ensure that once the PR is submitted, you check travis-ci for build issues and submit an update to your PR as soon as possible.